FIX: removed unused code