Fix enum logic and remove MessageTransport enum.