removed useless imports and default comments