remove garbage
more cleanup