Cleanup from devise fix