Remove menu support