Removing session usage because it's naughty