Removed remaining remnants of this removed feature