Clean up POM and some incorrect maven util references