Some import cleanup
Lanit plugin
Minor fixes