Removed old codes
Fixes according to checkstyle
Removed old codes
Fixes according to pmd