FIX - removed debug code