haddocks and removal of useless options