Remove Arrays due to beta 3 changes