Rempved hard-coding values for missing data