Removed locks on Unit and Building