Add log.
Remove some creepy code