Remove unused method
Simplified method declaration
Omit NPE when relay type is unknown
Removed unnecessary channel creation