clean up magic service
relocate hacky terminate to base service