Remove unwanted commented code