Tidy up. Removing stuff thats moved to other libraries