Cleans up commented and unused code