Issue #131 - removing hard coded data