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