Cleanup and updated several roles