removes deprecated stuff