Cleanup

Ready for launch(porbably)