Integrated Armin's source files and removed unused imports