Updates to remove unneeded dependency