Revert "updated version changed to correct current codename"

This reverts commit 61271eb747889b12f5caad32e76ed79815647225.
Revert "Add initial support for user expiry via user state"

This reverts commit 414bcfd723295e3e2e36d3cb6f37610f628192f1.
lint fixes
more lint