Removing old temporary code