ahammett: remove broken roles
ahammett: general clean up