Slight rearrangement
Not sure why these weren't cached, doesn't seem to matter too much though
Let's move these guys here
Removing outdated stuff
tag was switched