Cleaned up pom.xml, resolving conflicts, removing obsolete stuff