Remove obsolete glDeleteTextures, minor cleanups

Change-Id: I72e9c13b2e0c20950178a61624e8be2a08fedc25