Dead code removal
Remove fsm functions, too