clean up code, remove unused foobar class
Merge pull request #1516 from stanislavromanov/master

clean up code, remove unused foobar class