some cleanup - remove pollInterval, added TODOs