Fix error and removed unecessary files