Removing long poll
Code tidy