more code cleanup for FilePage architecture