Revert "added combo locks"

This reverts commit ba01d78094d1e6898a71d8199c2f7d0c4793424f.