Removed removal of scripts, consolidated macros and main html, some other cleanup done.