Remove stageportal requirement and dependency