Removed unused data, and definitions