cleaned up Kato component