Don't request ship data twice and remove now unnecessary loading screen