Removed out of date Components. Modified classes to resolve potential bugs highlighted by PMD and FindBugs.