Minor cleanup
Remove FRC and use async request for pagination