removed pickadate and Picker