devise cleaned up