More multistep code removed