Got rid of unused serialiezed ID and organized imports