removed dependency on devise 2