#1859 + @Machaba-Machaba - Fixing pom dependencies and removing unwanted code