Removed unused code
- Converted to JDK 7 Diamond operators
- Removed unused imports
- Formatted code
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>