Removed unused code
Removed unused imports
Merge remote-tracking branch 'UMS/5.0.0' into 5.0.0