Fixed small bugs
Removed old files