Got rid of all #set-s