Further cleanup regarding the main class metadata