Removed commented code, updated POM