Minor cleanup: Remove some todos, empty lines