Update import path and remove deps