cleaned up flock api to remove things handled elsewhere