E435: General cleanup