more cleanup

/to @raymondfeng 
/cc @ritch