cleaning up, using new interfaces