Removed locks from plugin