MHAPI clean up part one