fixes for destroy step