removed debug code +review MPF-327