removed user state cruft