Cleanup and streamlining.