Move mta away, prepare for wrapper