At last, make it work.
Remove unused imports
Automated merge with git+ssh://github.com/k-bx/web_shelf.git