removed unneeded code / comments