remove unneeded code
fix return type
fix simply option + tests for #1484 and #1992