Stripped placeholder from some things that didn't need it.
Merge branch 'redux' into redux_test