Clean up based on scoundrel changes