Clean devise mess