Remove lots of no longer necessary + Send annotations