fixed selection screen cleanup