Bug 884768 - Clean-up contents of frame.js. r=dhunt, r=ctalbert