WIP haml removal