massive cleanup. most testing discoveries