Removed unneeded code/commented code