chore: optimize imports and remove redundant comments