Updated: Remove old valueupdate code