major cleanup once again