Removed unsued files, cleanup info file and started to implement caching.