Clean up and simplification of texture registry