[Magic-HD-Night/Noire]More Code cleanup