Cleaning up some more, going to make the libraries from scratch