Adding renderable entity; cleanup