Re-enable guard branch that supports listen 2
Remove old datepicker stuff