Fixed render state caching.  Started render state cleanup