latest changes

Cleanup