Scrubbed some stuff