FIX: remove localStorage check