Typebounds cleaned up, removed unnecessary imports