Removed Cairo and simplified some things.