Lots of docs placeholders and cleanup