clean up to new class