Sound Control: remove locked logic from opo branch