Didn't complete the clean up for rolify and cancan, opps