Added more page cleanup