HAML removal WIP