Modifications to connectionmanager, removed unused methods.