Stripped placeholder from some things that didn't need it.