ST3 cleanup.
Further cleanup