removed devise, added haml