Clean up to merge v1 and v4 controller codebase.