Move conversion view DI into clean-up method for high performance