Removed depreciated imports