took some stuff out