scrubbed some unused stuff