Clean up initial configuration