About to cleanup considerably