Now that the loading template actually works, we can remove all this junk.