remove unused variable
remove unused variable
remove unused variables
change in date popup