Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages"