skeleton: Add bounds. Add constraint removal. Split update function.