Removed unplanned features