Remove hard coded array size