Remove unused method 'putIfNotNull()'
Remove unused imports