fix remove count, clean up removing file section of code, change count var names