Cleaned up the JDO relationships.