Cleanup

Ready for development