Optimize imports
Remove log statements
Update version
Avoid NPE