remove unnecessary usings
apply JetBrains Annotations

- also fix some TODOs