Remove unnecesary code from connection manager.
Remove commented and now not necesary code.