removed unecessary definitions