More gross clean up heh