Code Cleanup & Missing Dependencies in pom.xml added.