Removed extra imports and methods