WIP: eliminate extraneous methods