clean up. update to graphene bug fixes