Removed the TODO relating to wk's key