Continue to clean up from L0-ui
More cleanup