Cleanup Master's Call custom code