more cleanup of timon