Not generating cleanup block if empty