BUG-FIX: machine_stopped

REFACTORING: cleaned unused methods