Removing old stencil wrapper
Removing old scalar file
Removing old scalar stuff
Removing bad import