2.05.4:zeress:33 East Africa clean-up

- Should be mostly done now