Removed unnecessary methods
Moved connection checking to seperate class