Cleaned-up POM files