Removed unneeded feature