pom cleanup and constants update