NotFound spring-cleaning