Removes debugging and badly merged code