FIX: removed unused methods
FIX: remove unused methods