Removed redundant variables that were located across more than one folder