Remove unnecessary comments
Update rx paths