Further cleanup on renderables