Clean up + missing challongecalls to server