Removing logs
Moving date logic to template