Updated forgot to remove unneeded methods