Remove deprecated methods
Update bin/