Clean up

No functional changes