sass and js cleanup