Closes #23
Removed unused usings