remove commented code, rename Entries Entry