Removed a few things that remained from a feature that didn’t make it