cleaned out some remnants