cleaned up code a bit
Removed old files