[FIX] Removed unneccessary HashMap