Cleanup, verify working baseline before hbs pre-compiling