Remove AbstractConnection as it is not needed anymore