Fixed cleanup issues in adminui

Fixed cleanup issues in adminui