Removed some accedentally merged features.

8 jobs for v0.8.7 in 31 minutes and 59 seconds (queued for 2 seconds)