Removed unecessary files and minor bug fixes