Removed Json references as not required