Remove unused blocks and fix 'overmenu'