New Texture API clean-up