About to branch to T4 feature, done cleaning