Version update and cleanup