removing unneeded code, fixing checkin toast with duplicate year, rework file handling