Cleaned up app-contexts and pom.xml