some cleanups

Hi Cai,

not sure if github allows to pull this directly: I've removed the unnused geotools bloat and class files from history.