terrible cleanup + mysql schema