Remove master only condition