Feature/kaa 120

Comment the following function