removed unused imports & methods