Cleanup

@hillbrad: WDYT?