Removal of deprecated options and cleaning up of the handling