Removed exception clause never thrown
Removed redundand null checks
Removed redundant superinterface
Merge remote-tracking branch 'UMS/5.0.0' into 5.0.0
Removed unused imports