More generic clean up