Extend token and cleanup