removed the old code