Use new isEmpty method in utils instead of one-offs