Remove array dependency