Master cleanup #462