Some starting cleanup.