Fix for cleanup
Bump up version and update Changes