Renamed constants and deprecated old ones.
Removed commented out code.
Replace use of deprecated constants.
Removed unused class DownloadCache.