Remove the last bits of ti madness