Code cleaning, better solution for transparent models. AH-248