clean up UI + fix not needed cache clean