before alex cleanup