removed placeholders
Merge branch 'refs/heads/no-placeholders'