Removed alot of stuff that is now in the library