Remove map() and constrain()