remove menu logic is fixed