Remove unused functions
Fix handling of new predownload page