massive cleanup basically