Removed all the old 05 stuff.