Remove childProps since it's unused.  Also removed commented code at the bottom.