reincluded import files for eclipse
cleaned up and removed unnecessary code