Cleaning up page to get ready for Knockout integration