Rev'ing BP commit + minor clean-up