Removing the old code