WIP on casperjs cleanup