geehrc: herp derp (drunken flags) + cleanup

Change-Id: If63765e87a71e464e6b596bf94e0788f9d332f6f