Farm cleanup/refactor.