Fixed errors from last commit, removed locking functionalities