Some comment changes

- Added principle comment on the use of @NotNull
- Remove a commented line