Removed unnecesary code and deleted some files