Tweak placeholder
Remove unused code
Use more continuations