remove more magic from internals