removed unecessary features