Remove unused state property, explicitly define users property