yl/Polo - delete unrelated code and start to refactor