Remove Session dependencies in the Form and Image components