Custom: Cleanup.
Custom: more cleanup.