removed all other references to maskData (hopefully)