Remove commented out code and debugging