Removing unnecessary imports & removed some warnings from pom