Cleaned up devise