some cleanup while I think