try to attempt some cleanup