Removed unused code, added connect-method to get-method