Removed unused types