Starting to clean up my Cairo monstrosity.