Fix bugs and remove polls