FIX warning
Removing unsused code