Forgot to remove commented and unused code