Version update
Cleanup