removing a few remnants