Removing commented out multistep code