More cleanup of geb stuff