:rage2: more cleanup just for fun