Remove unused classes
Fix missing page count due to change from int to long