Remove old code in MasterVC