Removed unneeded method and comments