specified nullability in various source files and removed one unnecessary file