Fix CS and remove unused "use" statements
Merge pull request #133 from rybakit/cleanups

Fix CS and remove unused "use" statements