Removing old  code