Drop no longer useful patches
Release 1.21 and adjust documentation accordingly