- Remove redundant form flags - Fix various default values - Add some new collect options and remove options that do not exist anymore Signed-off-by: Jo-Philipp Wich <jo@mein.io>