Remove lots of no longer necessary + Send annotations

Indentation wasn't updated.