More code cleanup
Cleanup