add Kerim and cleanup