more bagage replaced with baggage and removed unused imports form some class