Cleaning up newproject

Preparing newproject for Better code & Cleaned up unused old code.