Code cleaing

Removed old code
Commented some unused code, ready for beta release