Ryan theme cleanup 7