Some cleanup
Some cleanup

Change-Id: Ic467f30d6f02f3014df8bb72f58ba86fbfc26867

WeRockStar/iosched,google/iosched,WeRockStar/iosched,google/iosched,google/iosched,jarekankowski/iosched,jarekankowski/iosched,jarekankowski/iosched,WeRockStar/iosched