cleanup of code base. Getting ride of unnecessary checks and commenting to show pagination section