Cleanup
More code cleanup.