Nick O: Small pom property cleanup