removed some things not needed for geeb mako