Feature/remove ux