cleanup unused code
Fix EXDATE problem