entities and ui now is at least cleaned up when layer does not clear on load