Removed automatic resize for stages in control
Moved remaining traces of emk to emp