Clean up for davey