Clean up fillIn