Cleanup + extract service