Remove deprecated code
MINOR FIX
Remove verbose logging