Clean up - remove unnecessary content from template