remove old options code