start of cleanup and a128gcm