Fixed import rotator namespace
Fixed per-origin source cleanup
Fixed method call