Fixed sync issue with SessionAmplify.
Cleaned up some draft control.