Tidy, remove commented code