Trying to clean up null values  which shouldn't be saved - ie null
Merge branch 'master' of github.com:ArcheProject/Arche