Cleaned some dead code
Cleaned more dead code
Added basic support for CPU symbolic scalar