Removed unneeded features