Cleanup, fixing merge issues.