WIP remove unneeded method