Removed flock.id and flock.identity.
Fixed (through ugly hackage) failing tests related to enviro references.