cleaning up the th-current branch