Clean-up a bit
Don't perform RIC analysis by default