Cut out broker features and concentrate on security