Remove util file
Fix issue with no page exist