Removal of unused stepdefs