Release 2.1 cleanup

Clean all the remaining troubles and do the Release...