Cleanup remnents of old commands