remove unused local captures, use @Local where needed (#77)

remove unused local captures, use @Local where needed (#77) #420