Removed old references to DISCONNECT object, unused code