Removed temp files and removed some comments