Removing TT and Home references