ticket:72 Removed unused imports