Cleanup

Nothing major.