Removed redundant rid stuff