Clean up where we go through