Removed now-redundant features