Removed dependencies on devise