Cleanup the berserker and add sanity checks