Fixed issue with entry dates under EE 2.7+; removed some redundant code