Clean up for use