Remove uneeded unbind + validation during save fixes