Remove prepend magic and make logging explicit