Removed unessesary features