Issue #45 Removed unused use statements