Change to master, remove moneta, cleanup

Tagging @doomspork for review