WIP: Varios small clean up while reviewing CRM related code
Clean up unimportant changes that have no impact so ever, or never used.
Clean up unimportant changes that have no impact so ever, or never used.
This will create a new commit in order to revert the existing changes.