removed unecessary things