Fix pagination bug + remove unused files