Clean up.
Schema update.
Transaction fn. separation.