cleanup, everything parametrized