Cleaning up code from debugging