CS fix and removing unneeded variable