Removed old unused file
Refactoring of date filters
Small Fix