Clean up slaves

Related