Clean up - 2nd approach.