removed some stuff for gaz