#621 KEWPA 5 clean-up