Cleanup of code.