Removed all TR1 stuff from the code