Simplify code; remove unwanted stuff from main content.