cleanup, finalize implementations/consolidations