optimized imports
removed protocol type tree; added a plain list of protocol types instead