Remove internal array crazyness