CONN-168 Cleanup