Minor: remove files not included in jar anyway
Minor: remove unnecessary code