Add rapidityuserhooks and some cleanup