[Magic-HD] Spaces clean up