Cleaned up POM