finished static analysis clean up