FIX: Removed redundant code