Cleanup, before starting to set up app using Yeoman.

Change-Id: I86f4d8894c3be5f5f82eee2c1c11df14bdd0b068