Merge "Remove unused methods from OMS"