Refactor upgrade step and hide profile