howto cleanup, f20 esp needs more testing and cleanup