Removed use of key container

Now its replaced by map for layer, layer for renderer.