cleanup imports and redundant return statements