removed unused types and elements