[WIP] Clean up

@lshepstone