Cleanup encryption interceptor, update todo, user proper salt.