Fixed current-day-pattern and removed some dead code