MNT: Removed unused file and organized imports