GK Clean of 16th Feb

Signed-off-by: gkomakech <gkomakech@gmail.com>