Cleaned up some more devise forms
More devise cleanup