Remove old folder

more clean ups