Clean up to prepare for HTML-Pipeline implementation