Removing this in-dev code