Remove useless code, MAS-185
Merge pull request #62 from thomaroger/MAS-185-cache

Remove useless code, MAS-185