FEATURE - remove devise