more legacy cleanup
Cleanup