Remove debug statements
Move configuration changes to separate script