Only remove empty entries