Fix params
More cleanup
Get rid fo caching - SoC