Rule checking cleanup