clean up, mainly on database handlers and model creation/factories