#129 removing "state"