remake all controllers plus remove so prop from context.model