Remove stuff that is not needed with new ConnectionMaker approach