Removed unused imports
Refactored security utils into separate class + added some her security methods