more terrible code removal