Static checking cleanup