Refactor logging and remove unused page