Update pagination
Clean up files