remove unused code
Change placeholder for #s