FIX: debug code removed