Removed unnecessary connectivity manager