Clean up the way we handle auto loading steps