Stop storing api_base in session
First pass at subsessions for rest_minimal