Removed a few features hopefully making merging from upstream/master a bit easier
Removed a few features hopefully making merging from upstream/master a bit easier

warmfusion/statusdashboard,warmfusion/statusdashboard,warmfusion/statusdashboard