massive cleanup(2)