Removed some unnecassary files, and fixed issue #1