Fixed slight text problem & removed unneeded code