FS-6375 remove a few things that aren't needed
FS-6375 correct copy and paste error