Removing two unsupported features until they're finished. v1.0.1