Cleaning up for testing and publishing and more to come