Cleaned some few things from SDK sample