Removed unused types for easier maintainance.