Removed unnecessary libraries, minor fixes