removal of var_dumps
tweak caching
remove conditional