removing old bits, cleaning up