Clean up.

- Remove compilation errors.