Fixed DataStore related issue and cleaned up pom

No match.