Remove all these modifications. If we need modifications in a Building Block, we should request it in a separate bug due to we will be unaligned with all the other apps. Thanks!