cleanup + better getters for operation queues