Merge branch Cleanup

Removed old files and cleaned unused variables.