modified pom and removed old classes