fixed more of eclipse's mess
more cleanup