More cleanups to finetuning