Refac to #empty