remove crazy locking until I have a better idea