Remove old commented code

Remove a few yaseo remnants

Change-Id: Iaa8adfd3c9395fba30f232bfa8492d317d62c095
Merge "Remove old commented code"