Cleaned up the flow through commonApiBase