removed unneeded coding