Remove unnecessary transition query