Remove comparison in value handler