Got rid of model name dependency for disabling motion