* re-enable lint unnecessary_const * remove trailling whitespaces * remove unnecessary const (after merge)