Removed custom roles stuff.
Getting ready for version 3.1.1.