Now that the shapedelete commands are child commands we shouldn't handle them seperately
This also fixes bug:286888