Cleanup of previous version leftovers.