Version 0.97.3 Remove all null from code