Remove AMD Import command and refactoring

Closes #9