Removed hardcoded defect types and severities

Removed hardcoded defect types and severities