some garbage cleanup fix attempts