Remove machine API

Remove machine API