temporary cleanup for switch block