Fixes pagination & removes unused method