Updated and cleanup

Change-Id: Ifa2445fdebab8864603621ad05dff48a4742349e
cleanup

Change-Id: I838b12530e0b9c2f37472adc9dcd252e38fedaaa
Merge pull request #33 from TeamHorizon/default

Default