Should remove commented out code (unless it's useful)