Clean up for cross building.

release?