Further cleanup on page move.