Basic cleanup for ContextListPanel