POM + Basic sample cleanup