Add cleaner checks