Prepare for 1.2 hosting
Things to remove from master templates