Fixed some errors from last commit and cleaned up ennecessary files