WIP HAML cleanup and removal