Removed op and staff blocking in preparation for a better control
system.