Removed unneeded code + fix possible cache issue in Summary Funcs