Fixed preparing options so defaults will not be overriden
Added possibility to remove poller and abort polling completely