clean-up: Removed commented data. Caching still commented.