Removed old data not in use anymore