Change to master, remove moneta, cleanup