cleanup, removed unnecessary imports and methods