Clean up active xhr
Testing and improvements