poll removal
better handling of user
remove some <api 14 dependencies