removed unneeded features