Removed unused stop support